knot: update to version 3.5.1

Release notes: https://www.knot-dns.cz/2025-10-16-version-351.html

Delete patches already merged into master branch

Signed-off-by: Jan Hák <[email protected]>

diff --git a/net/knot/Makefile b/net/knot/Makefile
index a7e51f6920a3acef312633201bc9935534a9c31f..b564d997541a96c7938e3f59adc1d3a188ea970e 100644 (file)
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knot
-PKG_VERSION:=3.5.0
+PKG_VERSION:=3.5.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_HASH:=d52538bf7364c280999dec58c2a02a405dd922ef5794da1473ca7c3cf7f01277
+PKG_HASH:=a614d5226ceed4b4cdd4a3badbb0297ea0f987f65948e4eb828119a3b5ac0a4b
 
 PKG_MAINTAINER:=Daniel Salzman <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later LGPL-2.0-or-later MIT ISC BSD-3-Clause

diff --git a/net/knot/patches/03_common_stats.patch b/net/knot/patches/03_common_stats.patch
deleted file mode 100644 (file)
index 6d965a5..0000000
--- a/net/knot/patches/03_common_stats.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4f02c29b67790ff05f23fc6593e145be7c223c70 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20H=C3=A1k?= <[email protected]>
-Date: Tue, 23 Sep 2025 12:52:25 +0200
-Subject: [PATCH] fix: failing build of knot/common/stats.c on PowerPC and MIPS
-
----
- src/knot/common/stats.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/knot/common/stats.c
-+++ b/src/knot/common/stats.c
-@@ -127,8 +127,8 @@ int stats_server(stats_dump_ctr_f fcn, s
-       }
- 
-       DUMP_VAL(params, "zone-count", knot_zonedb_size(ctx->server->zone_db));
--      DUMP_VAL(params, "tcp-io-timeout", ctx->server->stats.tcp_io_timeout);
--      DUMP_VAL(params, "tcp-idle-timeout", ctx->server->stats.tcp_idle_timeout);
-+      DUMP_VAL(params, "tcp-io-timeout", ATOMIC_GET(ctx->server->stats.tcp_io_timeout));
-+      DUMP_VAL(params, "tcp-idle-timeout", ATOMIC_GET(ctx->server->stats.tcp_idle_timeout));
- 
-       return KNOT_EOK;
- }

diff --git a/net/knot/patches/04_configure_fix_linking_with_libhiredis.patch b/net/knot/patches/04_configure_fix_linking_with_libhiredis.patch
deleted file mode 100644 (file)
index 8c11efa..0000000
--- a/net/knot/patches/04_configure_fix_linking_with_libhiredis.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e1e8a763086efd91b3b167ec238c10d46c6e6a31 Mon Sep 17 00:00:00 2001
-From: Daniel Salzman <[email protected]>
-Date: Fri, 26 Sep 2025 14:46:20 +0200
-Subject: [PATCH] configure: fix linking with libhiredis if --disable-redis
-
----
- configure.ac | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -264,11 +264,9 @@ AC_ARG_ENABLE([redis],
-    AS_HELP_STRING([--enable-redis=auto|yes|no], [enable Redis support [default=auto]]),
-    [], [enable_redis=auto])
- 
--PKG_CHECK_MODULES([hiredis], [hiredis], [have_hiredis=yes], [have_hiredis=no])
--
- AS_CASE([$enable_redis],
--   [auto], [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [enable_redis=no])],
--   [yes],  [AS_IF([test "$have_hiredis" = "yes"], [enable_redis=yes], [AC_MSG_ERROR([libhiredis not available])])],
-+   [auto], [PKG_CHECK_MODULES([hiredis], [hiredis], [enable_redis=yes], [enable_redis=no])],
-+   [yes],  [PKG_CHECK_MODULES([hiredis], [hiredis], [enable_redis=yes], [AC_MSG_ERROR([libhiredis not available])])],
-    [no], [],
-    [*], [AC_MSG_ERROR([Invalid value of --enable-redis.])]
- )